From 11f063545a4d4b75105b480491f247770b2d7a8a Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Mon, 22 Jan 2007 16:27:03 +0000 Subject: [PATCH] [PVFB] Set keyboard layout of PVFB from configuration file. For example: keymap = "ja" Default remains en-us. Signed-off-by: Takanori Kasai Signed-off-by: Tomohiro Takahashi Signed-off-by: Masami Watanabe --- tools/python/xen/xend/server/vfbif.py | 4 +++- tools/python/xen/xm/create.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/xend/server/vfbif.py b/tools/python/xen/xend/server/vfbif.py index dfa94c2989..7bfe850593 100644 --- a/tools/python/xen/xend/server/vfbif.py +++ b/tools/python/xen/xend/server/vfbif.py @@ -14,7 +14,7 @@ def spawn_detached(path, args, env): os.waitpid(p, 0) CONFIG_ENTRIES = ['type', 'vncdisplay', 'vnclisten', 'vncpasswd', 'vncunused', - 'display', 'xauthority'] + 'display', 'xauthority', 'keymap' ] class VfbifController(DevController): """Virtual frame buffer controller. Handles all vfb devices for a domain. @@ -68,6 +68,8 @@ class VfbifController(DevController): vnclisten = config.get("vnclisten", xen.xend.XendOptions.instance().get_vnclisten_address()) args += [ "--listen", vnclisten ] + if config.has_key("keymap"): + args += ["-k", "%s" % config["keymap"]] spawn_detached(args[0], args + std_args, os.environ) elif t == "sdl": args = [xen.util.auxbin.pathTo("xen-sdlfb")] diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index e1eb8472e6..ac90ff177c 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -594,6 +594,9 @@ def configure_vfbs(config_devs, vals): 'xauthority', 'type', 'vncpasswd' ]: err("configuration option %s unknown to vfbs" % k) config.append([k,v]) + for n in iter(dir(vals)): + if n == "keymap": + config.append(['keymap',vals.keymap]) if not d.has_key("display") and os.environ.has_key("DISPLAY"): config.append(["display", os.environ['DISPLAY']]) if not d.has_key("xauthority"): -- 2.30.2